From 4cee658f5fff4cda0a416a900067295f3d9a83f8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 14 Nov 2015 18:25:24 -0500 Subject: [PATCH] Adwaita: Misc cleanups Various cleanups and simplifications. --- gtk/theme/Adwaita/_common.scss | 23 +++++++---------------- gtk/theme/Adwaita/gtk-contained-dark.css | 22 ++++++++-------------- gtk/theme/Adwaita/gtk-contained.css | 22 ++++++++-------------- 3 files changed, 23 insertions(+), 44 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index f84cca7b36..3008995f1d 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -141,8 +141,12 @@ rubberband { flowbox { & rubberband { @extend rubberband; } & flowboxchild { - padding: 2px; - &:selected { @extend %selected_items; } + padding: 3px; + border-radius: 3px; + &:selected { + @extend %selected_items; + outline-offset: -2px; + } } } @@ -194,15 +198,6 @@ textview { // This will get overridden by .view, needed by gedit line numbers $backdrop_base_color, 50%); } } -.grid-child { - padding: 3px; - border-radius: 3px; - &:selected { - @extend %selected_items; - outline-offset: -2px; - } -} - popover.magnifier, %osd, .osd { color: $osd_fg_color; @@ -2602,10 +2597,6 @@ list { } } -.grid-child { - padding: 2px; -} - row.activatable { &.has-open-popup, // this is for indicathing which row generated a popover see https://bugzilla.gnome.org/show_bug.cgi?id=754411 &:hover { background-color: if(variant == light, transparentize($fg_color, 0.9), transparentize($fg_color, 0.95)); } @@ -2723,7 +2714,7 @@ row { *************/ expander { - arrow { + & arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } &:hover { color: lighten($fg_color,30%); } //only lightens the arrow diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 0d1a553a0e..65489ddf6a 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -89,7 +89,10 @@ treeview.view rubberband, background-color: rgba(24, 68, 114, 0.2); } flowbox flowboxchild { - padding: 2px; } + padding: 3px; + border-radius: 3px; } + flowbox flowboxchild:selected { + outline-offset: -2px; } label.separator { color: #eeeeec; } @@ -127,12 +130,6 @@ textview { textview:backdrop { background-color: #333636; } -.grid-child { - padding: 3px; - border-radius: 3px; } - .grid-child:selected { - outline-offset: -2px; } - popover.magnifier, popover.osd, .app-notification, @@ -3610,9 +3607,6 @@ list { list row { padding: 2px; } -.grid-child { - padding: 2px; } - row.activatable.has-open-popup, row.activatable:hover { background-color: rgba(238, 238, 236, 0.05); } row.activatable:active { @@ -4465,20 +4459,20 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, -.view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, +.view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { background-color: #215d9c; color: #ffffff; } textview text selection:insensitive, - .view selection:insensitive, iconview:insensitive:selected, flowbox flowboxchild:insensitive:selected, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, + .view selection:insensitive, iconview:insensitive:selected, flowbox flowboxchild:insensitive:selected, label selection:insensitive, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { color: #90aece; } textview text selection:backdrop, - .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, + .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:insensitive, - .view selection:backdrop:insensitive, iconview:backdrop:insensitive:selected, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, + .view selection:backdrop:insensitive, iconview:backdrop:insensitive:selected, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { color: #648eba; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 5381835448..f3c1bb73f5 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -89,7 +89,10 @@ treeview.view rubberband, background-color: rgba(42, 118, 198, 0.2); } flowbox flowboxchild { - padding: 2px; } + padding: 3px; + border-radius: 3px; } + flowbox flowboxchild:selected { + outline-offset: -2px; } label.separator { color: #2e3436; } @@ -127,12 +130,6 @@ textview { textview:backdrop { background-color: #f6f6f6; } -.grid-child { - padding: 3px; - border-radius: 3px; } - .grid-child:selected { - outline-offset: -2px; } - popover.magnifier, popover.osd, .app-notification, @@ -3772,9 +3769,6 @@ list { list row { padding: 2px; } -.grid-child { - padding: 2px; } - row.activatable.has-open-popup, row.activatable:hover { background-color: rgba(46, 52, 54, 0.05); } row.activatable:active { @@ -4637,21 +4631,21 @@ headerbar.selection-mode button.titlebutton, textview text selection, textview text selection:focus, .view selection, -.view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, .grid-child:selected, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, +.view selection:focus, iconview:selected, iconview:selected:focus, flowbox flowboxchild:selected, label selection, label selection:focus, label selection:hover, entry selection, spinbutton selection, entry selection:focus, spinbutton selection:focus, modelbutton.flat:selected, .menuitem.button.flat:selected, treeview.view:selected, row:selected, .sidebar :selected { background-color: #4a90d9; color: #ffffff; outline-color: rgba(255, 255, 255, 0.3); } textview text selection:insensitive, - .view selection:insensitive, iconview:insensitive:selected, flowbox flowboxchild:insensitive:selected, label selection:insensitive, .grid-child:insensitive:selected, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, + .view selection:insensitive, iconview:insensitive:selected, flowbox flowboxchild:insensitive:selected, label selection:insensitive, entry selection:insensitive, spinbutton selection:insensitive, modelbutton.flat:insensitive:selected, .menuitem.button.flat:insensitive:selected, treeview.view:insensitive:selected, row:insensitive:selected, .sidebar :insensitive:selected, placessidebar row:selected:insensitive label { color: #a5c8ec; } textview text selection:backdrop, - .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, .grid-child:backdrop:selected, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, + .view selection:backdrop, iconview:backdrop:selected, flowbox flowboxchild:backdrop:selected, label selection:backdrop, entry selection:backdrop, spinbutton selection:backdrop, modelbutton.flat:backdrop:selected, .menuitem.button.flat:backdrop:selected, treeview.view:backdrop:selected, row:backdrop:selected, .sidebar :backdrop:selected { color: #ffffff; } textview text selection:backdrop:insensitive, - .view selection:backdrop:insensitive, iconview:backdrop:insensitive:selected, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, .grid-child:backdrop:insensitive:selected, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, + .view selection:backdrop:insensitive, iconview:backdrop:insensitive:selected, flowbox flowboxchild:backdrop:insensitive:selected, label selection:backdrop:insensitive, entry selection:backdrop:insensitive, spinbutton selection:backdrop:insensitive, modelbutton.flat:backdrop:insensitive:selected, .menuitem.button.flat:backdrop:insensitive:selected, treeview.view:backdrop:insensitive:selected, row:backdrop:insensitive:selected, .sidebar :backdrop:insensitive:selected, placessidebar row:selected:insensitive label:backdrop, placessidebar row:selected:backdrop:insensitive label { color: #80b1e4; } -- 2.30.2